Late drain removal